diff --git a/scm-ui/ui-components/src/CardColumn.tsx b/scm-ui/ui-components/src/CardColumn.tsx
index fd84b9b11e..f7e7570d1d 100644
--- a/scm-ui/ui-components/src/CardColumn.tsx
+++ b/scm-ui/ui-components/src/CardColumn.tsx
@@ -5,7 +5,7 @@ import { Link } from "react-router-dom";
 
 type Props = {
   title: string;
-  description: string;
+  description?: string;
   avatar: ReactNode;
   contentRight?: ReactNode;
   footerLeft: ReactNode;
diff --git a/scm-ui/ui-components/src/forms/DropDown.tsx b/scm-ui/ui-components/src/forms/DropDown.tsx
index b65c48b49d..97b31d4413 100644
--- a/scm-ui/ui-components/src/forms/DropDown.tsx
+++ b/scm-ui/ui-components/src/forms/DropDown.tsx
@@ -13,10 +13,15 @@ type Props = {
 class DropDown extends React.Component<Props> {
   render() {
     const { options, optionValues, preselectedOption, className, disabled } = this.props;
+
+    if (preselectedOption && !options.includes(preselectedOption)) {
+      options.unshift(preselectedOption)
+    }
+
     return (
       <div className={classNames(className, "select", disabled ? "disabled" : "")}>
         <select value={preselectedOption ? preselectedOption : ""} onChange={this.change} disabled={disabled}>
-          <option key="" />
+          <option key={preselectedOption} />
           {options.map((option, index) => {
             return (
               <option key={option} value={optionValues && optionValues[index] ? optionValues[index] : option}>
diff --git a/scm-ui/ui-components/src/repos/changesets/changesets.ts b/scm-ui/ui-components/src/repos/changesets/changesets.ts
index c095e30e27..03ff858b0b 100644
--- a/scm-ui/ui-components/src/repos/changesets/changesets.ts
+++ b/scm-ui/ui-components/src/repos/changesets/changesets.ts
@@ -10,7 +10,7 @@ export function createChangesetLink(repository: Repository, changeset: Changeset
 }
 
 export function createSourcesLink(repository: Repository, changeset: Changeset) {
-  return `/repo/${repository.namespace}/${repository.name}/sources/${changeset.id}`;
+  return `/repo/${repository.namespace}/${repository.name}/code/sources/${changeset.id}`;
 }
 
 export function parseDescription(description?: string): Description {
diff --git a/scm-ui/ui-webapp/src/repos/codeSection/components/CodeViewSwitcher.tsx b/scm-ui/ui-webapp/src/repos/codeSection/components/CodeViewSwitcher.tsx
index 69e94e3024..66b9622693 100644
--- a/scm-ui/ui-webapp/src/repos/codeSection/components/CodeViewSwitcher.tsx
+++ b/scm-ui/ui-webapp/src/repos/codeSection/components/CodeViewSwitcher.tsx
@@ -28,13 +28,13 @@ const CodeViewSwitcher: FC<Props> = ({ url }) => {
       <SmallButton
         label={t("code.commits")}
         icon="fa fa-exchange-alt"
-        color={url.includes("/code/changesets/") ? "link is-selected" : undefined}
+        color={url.includes("/code/changesets") ? "link is-selected" : undefined}
         link={createDestinationUrl("changesets")}
       />
       <SmallButton
         label={t("code.sources")}
         icon="fa fa-code"
-        color={url.includes("/code/sources/") ? "link is-selected" : undefined}
+        color={url.includes("/code/sources") ? "link is-selected" : undefined}
         link={createDestinationUrl("sources")}
       />
     </ButtonAddons>
diff --git a/scm-ui/ui-webapp/src/repos/codeSection/containers/CodeOverview.tsx b/scm-ui/ui-webapp/src/repos/codeSection/containers/CodeOverview.tsx
index 3f7fa5c03f..0bdeb3fa4f 100644
--- a/scm-ui/ui-webapp/src/repos/codeSection/containers/CodeOverview.tsx
+++ b/scm-ui/ui-webapp/src/repos/codeSection/containers/CodeOverview.tsx
@@ -74,7 +74,7 @@ class CodeOverview extends React.Component<Props> {
     const { repository, baseUrl, branches, error, loading, t } = this.props;
     const url = baseUrl;
 
-    if (!branches || loading) {
+    if (loading) {
       return <Loading />;
     }
 
diff --git a/scm-ui/ui-webapp/src/repos/components/list/RepositoryEntry.tsx b/scm-ui/ui-webapp/src/repos/components/list/RepositoryEntry.tsx
index 6e0208d0aa..079c193c3c 100644
--- a/scm-ui/ui-webapp/src/repos/components/list/RepositoryEntry.tsx
+++ b/scm-ui/ui-webapp/src/repos/components/list/RepositoryEntry.tsx
@@ -22,14 +22,14 @@ class RepositoryEntry extends React.Component<Props> {
 
   renderChangesetsLink = (repository: Repository, repositoryLink: string) => {
     if (repository._links["changesets"]) {
-      return <RepositoryEntryLink icon="exchange-alt" to={repositoryLink + "/changesets"} />;
+      return <RepositoryEntryLink icon="exchange-alt" to={repositoryLink + "/code/changesets"} />;
     }
     return null;
   };
 
   renderSourcesLink = (repository: Repository, repositoryLink: string) => {
     if (repository._links["sources"]) {
-      return <RepositoryEntryLink icon="code" to={repositoryLink + "/sources"} />;
+      return <RepositoryEntryLink icon="code" to={repositoryLink + "/code/sources"} />;
     }
     return null;
   };