Merge pull request #23 from ithielnor/master

Button selection clearing and filter form rendering