Removed bourbon, added objects and updated grid