add forms and improve design