starting to match style to atanas design
resolving conflicts