Added support for view and added Forms