Add support for multi locaters and css clean up