Tweaks, cleaned up forms
Working on filters, cleaned up UI