deleted some code lines caused by merge conflicts and started correcting php-css-issues