Default theme polishing
Minor UI polishing