Various layout improvements