tightened up main styles
start separating out custom views