Added code for an improved UI. Still need to fix spacing of things for the UI but all components are there.