Refactoring. Menu position should now be perfect.