Restructured the models
Added logout template