Added properties and cleaned up html