Adding, fixing and other schtuff
Starting work on menus.