We got it this time :) Just a few more tweaks left