New layout and bug fixes