OS 5 and 6 UPS Support 

Improved layout for UPS

#120