Changed the layout to GridLayout