Add space between the content and screen borders
Rearrange custom class definitions