Pre 2.0 Overhaul

Most work for 2.0 done. Testing still needed and "Show user location"
needs the actual implementation.