Added titles and some margins