Fixed aesthetics and templates