redesign
Merge pull request #121 from dockyard/amanda-redesign

maria redesign