Merge pull request #265 from giact/develop

Fixed some minor GUI inconsistencies