UX UI

Work in progress