removed close button because of bugs
Merge branch 'master' into styling
removed close button because of bugs
Merge branch 'styling'