Cleaned code
Add Margins System page