Solved some marging errors