Reorganized views and layouts
Added error handlers