MAL-30 | Add field group and fix date fields

Not big deal
http://screencast.com/t/m1XBjLGs