Changed from dropdown navigation to button navigation
 #20