Replaced includes in dialog_removesurecheck_goal.xml
Removed some unnecessary layouts.
Merge pull request #20 from Rough/cleanup_layouts

Cleanup layouts