Although a great improvement, there's some work needs doing to the layout and alignments, it's kind of a mess tbh.