Fixed linting errors and moved views to match new pattern