Added filtering and some editing options