Added clear separation between fixed row height version and variable height version