refactor adn styling