Fixed margin issues