Leaving library 4/26
Added base menu
Improved basic menu
User menu functional
Fixed merge error