improved UI and made it fetch data properly
merge
merge