Add logging and some small UI changes