Working version but some elements may be added to menu bar