Small fixes on style and templates