Refactored into partials
Added Authentication