more UI changes
temporary checkin to resolve merge conflict