More cleanup within the views. Removed the extension to Activity.