Some tweaks and added close button
Merge branch 'release/v_0.3.0'