Finish some tweaks for the layouts and also fixed the jquery issue