Got the UI looking and working better.
Organized the code