initial layout improvements