adjusted alignment and layout