Fix - small UI issues