Little design modifications, including the comments addition in the layout