Rebuilt UI properly using Grids