Various misc changes. Mostly laying the groundwork for the Action Bar.