Made some stuff pretty
Merge branch 'facilities_rel2' of github.com:ShaastraWebops/ERP into facilities_rel2