Revamped layout to be table-less.