Added separate view file. Cleaned up.