Cleaner up layout.
Updated TO DO list.