Make changes so menu works. Should be more dynamic