Crypto changes again!

Re-added changes and added mainpage.xaml