Functionality and design fix (3)