Rewrite location, restyle buttons, unbreak layout