Fix/update styles and layout