UI - FB updates

Signed-off-by: Thomas Yuill <thomas.yuill@gmail.com>
UI - updates

Signed-off-by: Thomas Yuill <thomas.yuill@gmail.com>