Cleaned up objectPanel a bit