Doing some further tweaking, both looks and performance wise.