#846 Fix wrong margin
#853 Fix issues with responsive design spacing