various UI changes ready for 2nd version