Feature 44 modal style

Fix #63 Fix #44