#54 added filtering and enhanced ui