MP-187 #comment Try to help some with MP-187
Still need to rearrange the JS to fully fix it