UI cleanup & Action Bar work.