Few view changes and  namespace implementation.