Change to use flexbox positioning. Closes GH-1
Give containers more space, add margins