[KFSQA-567] Moved the @wip tag to the right feature and fixed some small style issues. I think it's ready to be merged to master.