Added a fix for keeping tags in correct position even after orientation changes