Cleanup layout a little