style & templates improved
style changed