preparations for 0.4, toolbar support