Deleted some commented out code.
Fixing layout issue.
Some more cleaning up.