Improve functionality, fix naming issues, fix closing tags issues and fix indentation