Nil check for step's virtual attributes and some layout fixes.