Rewrite with bootstrap, minor changes with selectors