Fix spacing issue and fix css designissue