update to grid system and various ui improvements