UI Tweaks
Fixed merge conflict and began work on AppBar.