More working functionality and UI-stuff