layout rearrangement
small changes