Slight UI polishing + toast