UI improvements + titles