more error message handling adn css cleanup