Work on UI

Changed some colors around for testing