Feature/js css fixes