more styling and layouts changed