made button/textfield names more meaningful in layouts