Fixes for minor UI issues