Minor ui fine tuning