Okay I think I've fixed it, but if it's still not right just let me know.