Cleaning UI

Still need to improve the icons and related