Cleanup + Update built-in GUI

The Built-in GUI should look better (like the older port)
and some cleanup to the code , more cleanup should come later.