Refactor grid items to separate component, lots of style & usability fixups