Formating and CSS fixes