Small changes to index and modal form has been completely re-factored