Change over to using a menu type solution for navigation + add a song search page