Add new convenience menu and small code cleanup in the api backend. More to come