cleaned up code, added ui styling