reorganize, fix buttons, fix textarea