Added structure and fixed margins