Added margins (WIP)