Merged Jakobs UI and fixed some minor stuff