Made alot of changes on the ui