Polish work, now using ActionbarLayer