some more styling & fixes