Fixing UI alignments and cosmetic bugs