Refactoring

there are some issues in gridLayout positioning.