some layout adjustments, uncomment out some code in activity that had
errors but now doesn't, and organized imports