Css changes

More css changes and some restructuring