Sylvia/ora2/tim 384

I'm done with the UI revisions and @Lyla-Fischer  has reviewed them. Can I get an OK from @talbs as well?