Final design adjustments
Merge with dev/j2/common