Added primary menues, fixed some bufs with movement