Add close button for 2 forms Fixes #45