More structure and UI work
Updated config