Added UI polish