UI Polish & fixes