bug fixed: layout correct