Various style updates

cleaning up style sheet, consolidating into main.css