Changed the bottom of output to 2Columns-View and added some TODOs