work in progress to make the app beautiful