change layouts to use layout weights