Pterodactly code completely merged

Still problems in navigation drawer and theme (?)