various improvements
Location modal on show