Updated view
Updated some view. Added Javadoc