more test, udpate layouts etc