Fix for Bug right side navigation