Neaten up layout