Enh: edited main layout