Default values added
Fixes modal position
Whitespace