Fix bugs and create first modal