Fixed grid layout and added spinner