UI fixes and a huge geoserver bug workaround (NOT fix)