some UI reorganizations
display directory
small cleanup