small adjustments, mainly layout