Tidied up files a bit and added 'Nothing Playing' stuff