PC & Android - Bug fixes and interface improvements