Added closure library + first attempt on buttons