UI and bug fixes - part 1