Correction of typos and indentations & add some TODOs
Fix branch layout
Simplify rendering and fix minor issues, typos, spelling