Various fixes across UI

Finalizing for v1.0.5