add compact forms and token tweaks settings