While on it, I think we should move the dropdown into a new file aswell