Various bugfixes and UI improvements (EdwardBock)