Fix some minor UI bugs
UI polishing