Refactored Html & Added Features