Fixed menu buttons and added/edited logic files