Cleaned up a bit and added states to buttons and presenting the track and release titles