Added a checkbox and fixed spaces