Added geometry and button