Updated styles
updated header and sidebar styles
added all of katys changes to html sidebar
updated header syles
finish merging