Config & upload fixes
Layout tweaks