Merge from forms branch
Add styles that conflicted during merge