increase number of options under links/teksts and perform a few other minor changes