Users templates removed and some layout fixes