some styling and buxfixes