Some changes in styles and layout