Small Fixes Main Template