svn path=/trunk/; revision=27182
Refactored GUI part to avoid code duplication. svn path=/trunk/; revision=27143