Added ThreadPicker and fixed some layout xmls