Bug fix & UI polish