Fix unit test error & reorganize entry detail layout