Feature/styling updates