Improved typography

Changed typography and button layout a little