fixing responsivity error for 2 columns layout
Fix merge problem at footer