Further improvements to structure, starting to change from context menu to contextual action bar