Fixed missing grid and buttons