refactored figure mixin
fixed go button