layout reworked a bit