Added filter & re-arranged menu