clean up and added minimal ui