0.3.x UI Changes part 3

2 quick fixes

@gchomatas @tpetr