[#255] fix layout bugs