Styles stabilized

(minor) reworked a few little things in the styles and refactored
activity_main.xml to use them uniformly.