account fix; some styles added; refactoring