Nicer layout in setup