New icons, menu bar and WIP code