Clean up of ui
Updating screenshots