Landing v-0.4

test-popup added
buttons changed