diff --git a/lib/screens/repository.dart b/lib/screens/repository.dart
index c243451..8507764 100644
--- a/lib/screens/repository.dart
+++ b/lib/screens/repository.dart
@@ -159,15 +159,15 @@ class RepositoryScreen extends StatelessWidget {
                           }
                           setState(() {});
                         },
-                        borderRadius: BorderRadius.circular(10),
-                        padding: EdgeInsets.symmetric(horizontal: 10),
-                        child: Row(
-                          children: <Widget>[
-                            Icon(Octicons.star, size: 15),
-                            SizedBox(width: 2),
-                            Text(repo.viewerHasStarred ? 'Unstar' : 'Star',
-                                style: TextStyle(fontSize: 15)),
-                          ],
+                        minSize: 0,
+                        color: theme.palette.primary,
+                        padding: EdgeInsets.symmetric(
+                          horizontal: 12,
+                          vertical: 4,
+                        ),
+                        child: Text(
+                          repo.viewerHasStarred ? 'Unstar' : 'Star',
+                          style: TextStyle(fontSize: 17),
                         ),
                       )
                     ],
diff --git a/lib/screens/user.dart b/lib/screens/user.dart
index a6cbc49..6797e12 100644
--- a/lib/screens/user.dart
+++ b/lib/screens/user.dart
@@ -367,7 +367,7 @@ class UserScreen extends StatelessWidget {
                     GithubUserArguments(login: login, isViewer: isViewer)));
         return isViewer ? data.data.viewer : data.data.repositoryOwner;
       },
-      title: AppBarTitle(isViewer ? 'Me' : 'User'), // TODO:
+      title: AppBarTitle(isViewer ? 'Me' : login),
       actionBuilder: (payload, _) {
         switch (payload.resolveType) {
           case 'User':
diff --git a/lib/widgets/link.dart b/lib/widgets/link.dart
index 655f7ed..052184d 100644
--- a/lib/widgets/link.dart
+++ b/lib/widgets/link.dart
@@ -65,8 +65,9 @@ class Link extends StatelessWidget {
     switch (theme.theme) {
       case AppThemeType.cupertino:
         return CupertinoButton(
+          minSize: 0,
           child: child,
-          padding: EdgeInsets.all(0),
+          padding: EdgeInsets.zero,
           onPressed: () async {
             if (onTap != null) onTap();
             if (url != null) theme.push(context, url);