moved css
moved logic