Making buttons more
Merge branch 'FilterUI' into development