Refactored some html and fixed page template in settings