Removed some old layouts/activities. Modified some layouts to the new
style.