UI tweaks, remove unused widgets