Huge update on styling