Updated view
Removed unused controller
Indentation and overall structure update