Fix - Rendering the correct page