Misc fixes in Fabric GUI