Nuke redundant code for the Freetext widget
Layout header links better