Minor UI restructuring