Pretty happy with general layout now, lots of things to tweak/fix but majority of layout, etc. finished