Corrected layout to give a unified feel

Signed-off-by: Conrad Gomes <conrad.s.j.gomes@gmail.com>