Converted everything except map to Fragment
converted map as well