Cleanup.
Added volume-control. Added logout-action.