Do current_user check in helper and refactor views