styling, view changes, cleanup