Make Edit Mode More Presentable