Added GridViewController, UI improvements