Made some adjustment on the layout