Refactorings
Updated location list
Multi column list