Moved the views around to my preference / added jade includes