Version 3.0.2

Template layout tweaks