major UI overhaul
refactored UI some more
merged
merge finished