did some modification about the layout