-More layout improvements