merged form and added bootstrap files