save and delete buttons updated
merged some design tweaks and fixed conflicts
fixed exception and updated equipment custom report save/delete