Live Server Update 1

Refinements made after testing on live server