Some GUI fixes for buttons, fixes for main filter