Hi,
Try this one instead of the previous, it should do the trick on both issues:
I have tested on FF, Chrome and IE, it should be fine. Please note, that I can not guarantee this will work in all situation, as it is a customization request.
Make sure to clear all the cache, including the browser cache when testing.