Fixes to the UI - Thanks to Kennedy Kasina @codealot