Added better player layout, lots of grid view tweakage