layout changed to fit design