Fixed HTML, dropdown, refactored

The refactored version is the finished one