use a totally different way for the layout, hope it will be more flexibility. And some other changes.