Changed the radiobuttons to working tabs instead. Solved some errors while selecting items in lists.
Merge remote-tracking branch 'origin/master'