Added map functionality
Added custom toast functionality
Small changes