adjust layout and set up nullstore
bump version