UI updates. Pulled changes from J-SBL