Removed hardcoded css classes