Simplify views and use helper methods