finished edit and some styling