Task #144: Fixed css style for padding and margin page
Task #144: Fixed merge conflict