Add sub-titles
Move nav to better spot