added forms - improved GUI