fixed margin issues and added gray borders so occasions seem to come from SOMEWHERE