Cleaned up alot of the code, fixed a few attributes, removed extraneous information on the UI side.

SFH