Cosmetic fixes and added always on top setting