Added menu bar / refresh options; more cleanup