Update views to be more mobile friendly
Set up matching