More refactor - got radio stuff out of entryactivity