Started with modal for new item [WIP]