Visual tweaking...

Visual tweaks and TODO comments added on what I need to go fix