Merge pull request #28 from niwatoribaka/master

final?
Merge pull request #29 from niwatoribaka/master

final
clean up css, rearrange results
Merge pull request #30 from LibreWulf/master

clean up css, rearrange results
Merge pull request #3 from afuhrtrumpet/master

Final merge