Improved Layout see #9
Fixed typeahead. fix #9