Corrected else if loop
Added pins for menu navigation etc.