Fix RWD grid system bug
Adjust layout