cleanup layout a bit