code cleanup
added separate view files