Lots of fixes and improvements in UI; File got moved, no idea what that's about