Fixed some spacing issues (still need to do step defs)