UX

Layout and toggle aside