Styling tweaks and adding correct title
fix merge conflicts :(