Fixing TOOLS-2464 - Removed QoS property and rearranged the properties window