Fix padding on checkbox, Add filter feature, cleanup