Moved all controls to ribbon / added additional filtering