some css changes
merge
 Merge branch 'master' of https://github.com/bleveque/lechuga
redrawing annulus
fixing conflicts