Added close button. Tidied up margin layout bug on SongSelectorView