Alot of GUI-changes and other small fixes