More optimisation: Removing green button and duplicate layouts.