issue#488 - rearranged the layout of entryview