final style and layout changes