Issue #17 Added surfaces and clear icon