Some quick fixes... we really need some unit testing in the UI