Improve chick and global layout, add some features