Cleaned up site, added 'current'