New App Version

-tidy up
-bg color changed