styling & bugfixing