More layout cleanups