more styling, fixed some brokenness