Tweaked view output to make it work better with the themeing
Added field group for Hours Key
Merge branch 'themeing'