Small bug-fixes
Added modal