Reformatted display and fixed issue with reaching bottom of terminal screen

Also removed some comments, re-indented.