Rearranged Template + controller, fixed some bugs, updated the routes + entities