Fixed margin bug, submit bug