PIP2-12 - Implement first mock-ups

https://jira.berkeley.edu/browse/PIP2-12
Merge pull request #2884 from christianv/PIP2-12

PIP2-12 - Implement first mock-ups