quick fix on layout. Need to fix the padding