Layout tweaks
Fix up separators
Move loon back