Fixed main.css to use one direction margins
Updated layout margins