fixed the layout bugs, add contents