Updated contents and layout

Modified some of the contents and layout, next step is to finalized the
layout