UCP tabs and navigation
Small visual fixes