review functionality and design
conflict resolve
css change