Fix textarea sizes to look better
Fixed merge conflicts