Improve overall layout to be responsive