Further visual updates, start of refactor of edit modal