Modified modal width and some cleanup