Save file bug fix and some styleing