Implemented layout and colour changes