a few changes, layout etc