cleaning up code, adding better UI componenets