Some UI improvements and rotation