Template structure improvements, avatar and status item visual tweaks