Small refactor.
Fix a layout bug.
Fix another layout bug.