Cleaned up the aisle layout a bit, finished up the topbar