Tidying up some styles and bug fixing on edit