reorganized code
Added the panic view
merge conflict
working with controllers