Merge Develop to master

There was a bug with border-box. Squashed it and refactored a little