cleanup control layout a bit