Added D/L page, Cleaned up code