Implemented modal popup and format fixes done