view class and templates added
TODO annotation added
FIX: some typos and formatting