Removed template, fixed left margin calculation