Added form and work on layout