fix style and layout