New layout, bug corrections