Moved now playing to new controller, small fixes