Cosmetic fixes on frontend