further developed all views and controllers