Added new lines and dropdown selection is better