Working on layout - most gui functionality is running