ticket:1 fix template/styles