Make some space for attribute bonus.
Merge branch 'basic-forms' into knockoutjs

Use updated CSS and structure from basic-forms branch.