UI Merge Request

I feel that the UI with bonus Friendly Match Feature is complete and should be merged to master.