Cleanup

CSS changes, some layout changes. Should be reviewed for faults but has been tested.