Here is another layout that needed to be updated / corrected. Old layout was pretty rubbish and had a couple of bugs that were all...