reverted some fixes, css filtered
optimized