add more layout and form. also added toggle form hide/show