Move to work with bitmap and added menu