adding some extra features msjor update 2 with ui update