Clean up of Tap Gear layout