UI Bug fixes

Signed-off-by: mossrocket <peter@mossrocket.com>