Improving the UI for testing purposes

Little changes just to test the overall behavior and now that you are
moving through different pages when clicking the links.