New layout and bug fix