updated styles and script
merged
chnaged items layout
merged conflict
Merge pull request #6 from rnel/master

changed items layout