Added better navigation and removed php 5.4 array syntax