More work on entry dialog. More or less functioning as expected.