xml improvments, ui changes, all around good stuff