Bug Fix - Device ordering

Fix a bug where the order of the devices on the      Device setup page, changed after the first save.
Tidy up bootstrap css and js