Refactor and separate header to multiple files
Market selector