issue #6 restyled according to the new ux proposal