First attempt to move the links inside the form